Skip to content

[bugfix] aws_rds_cluster: Fix inability to update serverlessv2_scaling_configuration.min_capacity argument from 1 to 0 #44545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[bugfix] aws_rds_cluster: Fix inability to update serverlessv2_scaling_configuration.min_capacity argument from 1 to 0 #44545

wants to merge 3 commits into from
+14 −6

Conversation

@tabito-hara
Copy link
Contributor

@tabito-hara tabito-hara commented Oct 4, 2025 •
edited
Loading

Rollback Plan

If a change needs to be reverted, we will publish an updated version of the library.

Changes to Security Controls

Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.

Description

  • Bug in aws_rds_cluster resource #44468 reported an issue where min_capacity could not be changed from 1 to 0.
  • The function verify.SuppressMissingOptionalConfigurationBlock, configured as the DiffSuppressFunc for the serverlessv2_scaling_configuration block, is invoked not only for the block itself but also for its elements, including min_capacity.
    • This function suppresses the diff when the new value is 0 and the old value is 1, which exactly matches the behavior observed for min_capacity in this issue.
  • To fix the issue, the function is now invoked only when the argument name is serverlessv2_scaling_configuration.#, which excludes min_capacity.
  • Update the acceptance test to cover a case where min_capacity is changed from 1 to 0.
    • Without this modification, it is confirmed that the updated acceptance fails.

Relations

Closes #44468

Output from Acceptance Testing

$ make testacc TESTS='TestAccRDSCluster_serverlessV2Scaling' PKG=rds 
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 b-aws_rds_cluster-fix_serverlessv2_scaling_min_capacity_from_1_to_0 🌿...
TF_ACC=1 go1.24.6 test ./internal/service/rds/... -v -count 1 -parallel 20 -run='TestAccRDSCluster_serverlessV2Scaling'  -timeout 360m -vet=off
2025/10/05 01:54:09 Creating Terraform AWS Provider (SDKv2-style)...
2025/10/05 01:54:09 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccRDSCluster_serverlessV2ScalingConfiguration
=== PAUSE TestAccRDSCluster_serverlessV2ScalingConfiguration
=== RUN   TestAccRDSCluster_serverlessV2ScalingRemoved
=== PAUSE TestAccRDSCluster_serverlessV2ScalingRemoved
=== CONT  TestAccRDSCluster_serverlessV2ScalingConfiguration
=== CONT  TestAccRDSCluster_serverlessV2ScalingRemoved
--- PASS: TestAccRDSCluster_serverlessV2ScalingRemoved (175.22s)
--- PASS: TestAccRDSCluster_serverlessV2ScalingConfiguration (295.63s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/rds        299.866s

@github-actions
Copy link
Contributor

github-actions bot commented Oct 4, 2025

Community Guidelines

This comment is added to every new Pull Request to provide quick reference to how the Terraform AWS Provider is maintained. Please review the information below, and thank you for contributing to the community that keeps the provider thriving! 🚀

Voting for Prioritization

  • Please vote on this Pull Request by adding a 👍 reaction to the original post to help the community and maintainers prioritize it.
  • Please see our prioritization guide for additional information on how the maintainers handle prioritization.
  • Please do not leave +1 or other comments that do not add relevant new information or questions; they generate extra noise for others following the Pull Request and do not help prioritize the request.

Pull Request Authors

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

@github-actions github-actions bot added needs-triage Waiting for first response or review from a maintainer. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/rds Issues and PRs that pertain to the rds service. size/XS Managed by automation to categorize the size of a PR. labels Oct 4, 2025
@tabito-hara tabito-hara changed the title B aws rds cluster fix serverlessv2 scaling min capacity from 1 to 0 [bugfix] aws_rds_cluster: Fix inability to update serverlessv2_scaling_configuration.min_capacity argument from 1 to 0 Oct 4, 2025
@tabito-hara tabito-hara marked this pull request as ready for review October 4, 2025 22:05
@tabito-hara tabito-hara requested a review from a team as a code owner October 4, 2025 22:05
@ivanfoo ivanfoo mentioned this pull request Oct 22, 2025
Open
@ivanfoo
Copy link

ivanfoo commented Oct 22, 2025

@tabito-hara is this supposed to fix the issue when going in the opposite direction? When min_capactiy is updated from 0 to 1, the SecondsUntilAutoPause field should be omitted too

@tabito-hara
Copy link
Contributor Author

tabito-hara commented Oct 22, 2025

@ivanfoo
The issue when min_capacty is updated from 0 to 1, related to seconds_until_auto_pause, was already fixed in #41180.
In the current implementation, seconds_until_auto_pause is provided to the AWS API only when min_capacity in the configuration is 0.

terraform-provider-aws/internal/service/rds/cluster.go

Lines 2357 to 2361 in 03d14bb

if v, ok := tfMap["seconds_until_auto_pause"].(int); ok && v != 0 {
if min, ok := tfMap["min_capacity"].(float64); ok && min == 0.0 {
apiObject.SecondsUntilAutoPause = aws.Int32(int32(v))
}
}

@ivanfoo
Copy link

ivanfoo commented Oct 22, 2025

Thank you so much @tabito-hara, I've just seen the fix was included in the release version 5.96

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

needs-triage Waiting for first response or review from a maintainer. service/rds Issues and PRs that pertain to the rds service. size/XS Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Bug in aws_rds_cluster resource

2 participants

@tabito-hara @ivanfoo